[HVM] Use the right, PCI SIG assigned, vendor ID for xensource rather than

just making one up.

Signed-off-by: Steven Smith <sos22@cam.ac.uk>

diff --git a/tools/ioemu/hw/xen_platform.c b/tools/ioemu/hw/xen_platform.c
index 8b319858cb2220384f629026ad9bcaeb6ef2117b..89072925c28b9c155449ffd9a25ca87b086146f0 100644 (file)
--- a/tools/ioemu/hw/xen_platform.c
+++ b/tools/ioemu/hw/xen_platform.c
@@ -116,10 +116,10 @@ void pci_xen_platform_init(PCIBus *bus)
     d = pci_register_device(bus, "xen-platform", sizeof(PCIDevice), -1, NULL,
                            NULL);
     pch = (struct pci_config_header *)d->config;
-    pch->vendor_id = 0xfffd;
-    pch->device_id = 0x0101;
+    pch->vendor_id = 0x5853;
+    pch->device_id = 0x0001;
     pch->command = 3; /* IO and memory access */
-    pch->revision = 0;
+    pch->revision = 1;
     pch->api = 0;
     pch->subclass = 0x80; /* Other */
     pch->class = 0xff; /* Unclassified device class */

diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
index 2bb4dbd5b4e368780398877849c40008be3f7ffb..36ad585fbf22cc739ad31170f66240fa564fd540 100644 (file)
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -231,11 +231,13 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
        return ret;
 }
 
-#define XEN_PLATFORM_VENDOR_ID 0xfffd
-#define XEN_PLATFORM_DEVICE_ID 0x0101
+#define XEN_PLATFORM_VENDOR_ID 0x5853
+#define XEN_PLATFORM_DEVICE_ID 0x0001
 static struct pci_device_id platform_pci_tbl[] __devinitdata = {
        {XEN_PLATFORM_VENDOR_ID, XEN_PLATFORM_DEVICE_ID,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       /* Continue to recognise the old ID for now */
+       {0xfffd, 0x0101, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {0,}
 };